@@ -8,8 +8,10 @@ from django_logit import logit  | 
            ||
| 8 | 8 | 
                from django_response import response  | 
            
| 9 | 9 | 
                 | 
            
| 10 | 10 | 
                from account.models import UserInfo  | 
            
| 11 | 
                -from member.models import GoodsInfo, GoodsOrderInfo, MemberActivityInfo, MemberActivitySigninInfo, MemberActivitySignupInfo, RightInfo  | 
            |
| 12 | 
                -from utils.error.errno_utils import MemberActivityStatusCode, MemberGoodStatusCode, MemberRightStatusCode, UserStatusCode  | 
            |
| 11 | 
                +from member.models import (GoodsInfo, GoodsOrderInfo, MemberActivityInfo, MemberActivitySigninInfo,  | 
            |
| 12 | 
                + MemberActivitySignupInfo, RightInfo)  | 
            |
| 13 | 
                +from utils.error.errno_utils import (MemberActivityStatusCode, MemberGoodStatusCode, MemberRightStatusCode,  | 
            |
| 14 | 
                + UserStatusCode)  | 
            |
| 13 | 15 | 
                from utils.redis.rshot import get_shot_member_data  | 
            
| 14 | 16 | 
                 | 
            
| 15 | 17 | 
                 | 
            
                @@ -2,7 +2,8 @@  | 
            ||
| 2 | 2 | 
                 | 
            
| 3 | 3 | 
                from django.contrib import admin  | 
            
| 4 | 4 | 
                 | 
            
| 5 | 
                -from member.models import GoodsInfo, GoodsOrderInfo, MemberActivityInfo, MemberActivitySigninInfo, MemberActivitySignupInfo, MemberCouponInfo, ShotTypeInfo, RightInfo  | 
            |
| 5 | 
                +from member.models import (GoodsInfo, GoodsOrderInfo, MemberActivityInfo, MemberActivitySigninInfo,  | 
            |
| 6 | 
                + MemberActivitySignupInfo, MemberCouponInfo, RightInfo, ShotTypeInfo)  | 
            |
| 6 | 7 | 
                from utils.redis.rshot import update_shot_member_data  | 
            
| 7 | 8 | 
                 | 
            
| 8 | 9 | 
                 | 
            
                @@ -26,7 +27,7 @@ class GoodsOrderInfoAdmin(admin.ModelAdmin):  | 
            ||
| 26 | 27 | 
                 | 
            
| 27 | 28 | 
                 | 
            
| 28 | 29 | 
                class RightInfoAdmin(admin.ModelAdmin):  | 
            
| 29 | 
                -    list_display = ('right_id', 'right_type', 'icon', 'title', 'subtitle', 'detail', 'level1', 'level2', 'level3', 'level4', 'level5',  'minlevel', 'position', 'status', 'created_at', 'updated_at')
               | 
            |
| 30 | 
                +    list_display = ('right_id', 'right_type', 'icon', 'title', 'subtitle', 'detail', 'level1', 'level2', 'level3', 'level4', 'level5', 'minlevel', 'position', 'status', 'created_at', 'updated_at')
               | 
            |
| 30 | 31 | 
                     list_filter = ('right_type', 'status')
               | 
            
| 31 | 32 | 
                 | 
            
| 32 | 33 | 
                 | 
            
                @@ -3,11 +3,11 @@  | 
            ||
| 3 | 3 | 
                from django.db import models  | 
            
| 4 | 4 | 
                from django.utils.translation import ugettext_lazy as _  | 
            
| 5 | 5 | 
                from django_models_ext import BaseModelMixin, upload_file_path, upload_file_url, upload_path  | 
            
| 6 | 
                -from simditor.fields import RichTextField  | 
            |
| 7 | 6 | 
                from shortuuidfield import ShortUUIDField  | 
            
| 8 | 7 | 
                from TimeConvert import TimeConvert as tc  | 
            
| 9 | 8 | 
                 | 
            
| 10 | 9 | 
                from mch.models import ModelInfo  | 
            
| 10 | 
                +from simditor.fields import RichTextField  | 
            |
| 11 | 11 | 
                 | 
            
| 12 | 12 | 
                 | 
            
| 13 | 13 | 
                class GoodsInfo(BaseModelMixin):  |